Fix terrible merge