Added unittest for resolveConflictViewModel
Added basic comparison to conflict view