Update RuleMetadata.qll

Author: Nikita Kraiouchkine

cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll

@@ -33,11 +33,8 @@ import IO4
 import InvalidMemory1
 import Language1
 import Language2
-<<<<<<< HEAD
-import Memory2
-=======
 import Memory1
->>>>>>> upstream/main
+import Memory2
 import Misc
 import Pointers1
 import Pointers2
@@ -88,11 +85,8 @@ newtype TCQuery =
   TInvalidMemory1PackageQuery(InvalidMemory1Query q) or
   TLanguage1PackageQuery(Language1Query q) or
   TLanguage2PackageQuery(Language2Query q) or
-<<<<<<< HEAD
-  TMemory2PackageQuery(Memory2Query q) or
-=======
   TMemory1PackageQuery(Memory1Query q) or
->>>>>>> upstream/main
+  TMemory2PackageQuery(Memory2Query q) or
   TMiscPackageQuery(MiscQuery q) or
   TPointers1PackageQuery(Pointers1Query q) or
   TPointers2PackageQuery(Pointers2Query q) or
@@ -143,11 +137,8 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isInvalidMemory1QueryMetadata(query, queryId, ruleId, category) or
   isLanguage1QueryMetadata(query, queryId, ruleId, category) or
   isLanguage2QueryMetadata(query, queryId, ruleId, category) or
-<<<<<<< HEAD
-  isMemory2QueryMetadata(query, queryId, ruleId, category) or
-=======
   isMemory1QueryMetadata(query, queryId, ruleId, category) or
->>>>>>> upstream/main
+  isMemory2QueryMetadata(query, queryId, ruleId, category) or
   isMiscQueryMetadata(query, queryId, ruleId, category) or
   isPointers1QueryMetadata(query, queryId, ruleId, category) or
   isPointers2QueryMetadata(query, queryId, ruleId, category) or