all the changes
fix merge conflicts