deleted merge nonsense