Documentation: document pitfalls with 3-way merge