Get rid of merge conflict