commit changes
fix merge conflicts