Resolve latest merge

It wasn't merged