Fixed another shitty merge job. How do I stop this from happening!?