Solving merge problem
merging problem [3]