Edit conflicts are part of the normal operation of version-control systems and not a reason to panic!
ChaTo
The Web is a tool that enables people who have a life to benefit from the efforts of those who don't
Geoffrey Nunberg