implementing parent-conflicts and child-conflicts and detecting them