Committing the code after resolving conflict