The "good enough" version is my steps 1 and 2, and possibly 5. The other steps can be added later as time permits. The steps are in the order of implementation, not importance. Conflict resolution is easy once you realize that it always requires human intervention.