Fix bogus merge, sorry