Fix (again) problem with relative links
Fix merge conflicts