merge issues fixed