Correcting small errors due to merge