fix bad parts of the merge