Merge pull request #51 from fengjingchao/inst

remove bool return in scanConflicts
Merge pull request #52 from fengjingchao/inst

finish batch proposing