Merge from hell?