Fix fat fingered bad merge