Resolve when trailing slash in missing.
Merge and fix conflicts.