commiting before pull
fixing merge