Fix style merge