fix merge nonsense