make merging a little smarter