Added a case to resolveConflicts to handle null.