Fix all this unholy merge conflict nonsense