message: fixing invisible merge conflict
diff: @@ -33,7 +33,7 @@ void RemoveQualificationRecursive(unique_ptr<ParsedExpression> &expr) {
  if (expr->GetExpressionType() == ExpressionType::COLUMN_REF) {
  auto &col_ref = (ColumnRefExpression &)*expr;
  auto &col_names = col_ref.column_names;
  - if (col_names.size() == 2 && col_names[0] == MacroBinding::MACRO_NAME) {
  + if (col_names.size() == 2 && col_names[0] == DummyBinding::DUMMY_NAME) {
  col_names.erase(col_names.begin());
  }
  } else {
  