Remove broken conflict detection.

Signed-off-by: Jeremy Bongio <jbongio@us.ibm.com>