Fixed your merge nonsense