noul s6 merge