FIX: ext_tables after merge conflict