fix: remaining conflict in owl