Solve merge conflicts in all .html files