Repairing Conflicts and the 3 Steps to Making Things Right