s6 fixed merge