commiting before pulling
fix merge conflict