check in with merge problem