improvements
fix merge conflicts