Fix GTStatusDeltaStatusConflicted->GTDeltaTypeConflicted
Fix GTStatusDeltaStatusConflicted->GTDeltaTypeConflicted

- Former was my local name thats now removed

dleehr/objective-git,dleehr/objective-git,dleehr/objective-git,dleehr/objective-git