Fixed merge nonsense