Finish "special" git conflict resolution technique