(#451) - Conflict in views by default

Conflicts options are set to true by default in viewQuery. Add test in tests.views.js to check that query indeed returns with conflicts.