fixing merge conflict overwrite