Merge trouble