Fix merge conflict in prev_next.html