fixing the last bits of a bad merge :(