Fixed Merge problem