remove conflicts.
Merge branch 'master' of https://github.com/Thanu/SAT
adding test class