style merge issues