fix merge conflicts
fix stupid merge nonsense