Fix bad merge, pt 3