ParentFull threadnerdponx·Both! I need to be able to handle merge conflicts for data, but I also need the machine to be able to apply the changes.View on HN