fix OOIION-1350; typo in checking for _conflicts
Merge pull request #401 from pkediyal/1350

fix OOIION-1350; typo in checking for _conflicts