Trying to merge conflict