Manually added files for merge cause things. Aka I am bad at merge tool.