fixing merge issues