update q7 version (1.2.18) in pom.xml
Add new test for Conflicts group
update tests
add new test (for bug 405720)