Fix markup from bad merge.