Git fusionar conflicto resolución
$ git commit -m "Resolved merge conflict by incorporating both suggestions."
Weary Wallaby
$ git commit -m "Resolved merge conflict by incorporating both suggestions."
$ git add .