Solved another merge problem