Why does the merge not fix all the things?