resolved hidden merge problems