solve Merge conflict 2