Added resolveConflictView