commiting before merging
fixing merge conflicts