Dear Lord, let me seek the truth, but spare me the company of those who have found it.
Old US southern prayer.
Edit conflicts are part of the normal operation of version-control systems and not a reason to panic!
ChaTo