deal with merge conflicts