commiting to local repository
Commiting the changes to local repositoy
commiting the new file to local repository
Changes due to conflicts