Resolved merge conflicts
Initiate "special" git conflict resolution technique