Solve merge problem