Committing all files
Resolving conflict