Commiting my changes over resolved conflict 010