commiting before pull
merged