VE-1541: Oof, fixing conflict