merge trouble