Remove .html suffix
Merge