Comment by rurban

Next paragraph. The conflicts are not resolved. Or just use the non-solution as in git (or wikis). Leave it to human manpower.