merge conflict relatd improvements
Merge pull request #9 from adazzle/aqil-auto-qa

merge conflict related improvements