commiting before merge
fixed merge conflict