commit from the "First Branch"
Commit from terminal - Conflict resolved in the secondbranch