Fix incorrect isInConflict logic
#11
+18
−0
Merged
isInConflict logic
#11