Solved merging problem