minor updates
updates
fix merge conflicts