fix wiki links at the bottom
add note on ConflictResolverFactory