Commiting before pull
Fixing merge