removed leftover markup from merge