ParentFull threadjohnecheck·Conflict-free is right in the name, layering conflicts on top of it would be blasphemy :pView on HN