updates
fix merge conflicts