Improve documentation for conflict resolution

Signed-off-by: Sven Strickroth <email@cs-ware.de>