dealing with merge conflicts