get rid of merge conflict