first pass at conflict checking method. solutions have diagonal conflicts.
fixed diagConflict, cleaning up