Edit conflicts are part of the normal operation of version-control systems and not a reason to panic!
ChaTo
