More merging bugs