(#658) - Fix conflicts tests and clean default inclusion.
(#658) - Force inclusion of conflicts in view querying..