One other thing that Mediawiki (the Wikipeda software) does is help prevent conflicts by letting people just edit sections.
Two people can edit two different sections (eg H1/H2 delimited blocks) at the same time and not see the conflict resolution page afterwards. The talk pages also have an “add new section” feature, which lets a new section be added with no risk of edit conflict.