Fix conflict checking on Dispatcherview.
Added another test for conflicts.