Added jordis version.
Merge conflict should be resolved and should produce a working site. Should.