Improved resolveConflictViewModelTest structure