Edit conflicts are part of the normal operation of version-control systems and not a reason to panic!
ChaTo
The first ten million years were the worst. And the second ten million, they were the worst too. The third ten million, I didn't enjoy at all. After that I went into a bit of a decline
Marvin the Paranoid Android