Solving merge conflict