def resolveConflicts(self): notifier.conflictResolution(self.getConflicts())
def resolveConflicts(self): notifier.conflictResolution(self.getConflicts())
def resolveConflicts(self): notifier.conflictResolution(self.getConflicts())
def resolveConflicts(self): notifier.conflictResolution(self.getConflicts())