fixing a overwrite from a merge