Solve merge conflict