Clean up commented-out merge markers