Adds initial version of conflict detection

Equivalent adds not supported yet and more testing is needed.