solve Merge conflict