added checkEquivalency() and checkConflicts() functions to automatically resolve non-conflicting merges