Syntax crash possibly caused by merge conflict text

[pwrightcertinia]

java.lang.Exception: Apex parser context missing stop location, context at line 1, type class io.github.apexdevtools.apexparser.ApexParser$BlockContext
    at com.nawforce.runtime.parsers.Source.stampLocation(Source.scala:106)
    at com.nawforce.apexlink.cst.CST.withContext(CST.scala:36)
    at com.nawforce.apexlink.cst.OuterBlock.$anonfun$statements$4(Statements.scala:142)
    at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18)
    at scala.util.DynamicVariable.withValue(DynamicVariable.scala:59)
    at com.nawforce.apexlink.cst.OuterBlock.statements(Statements.scala:141)
    at com.nawforce.apexlink.cst.OuterBlock.verify(Statements.scala:118)
    at com.nawforce.apexlink.cst.ApexConstructorDeclaration.verify(BodyDeclarations.scala:422)
    at com.nawforce.apexlink.cst.ClassBodyDeclaration.validate(BodyDeclarations.scala:74)
    at com.nawforce.apexlink.types.apex.FullDeclaration.$anonfun$verify$8(FullDeclaration.scala:222)
    at com.nawforce.apexlink.types.apex.FullDeclaration.$anonfun$verify$8$adapted(FullDeclarat
    at scala.util.DynamicVariable.withValue(DynamicVariable.scala:59)
    at com.nawforce.apexlink.types.apex.FullDeclaration.$anonfun$validate$1(FullDeclaration.scala:122)
    at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18)
    at com.nawforce.pkgforce.diagnostics.LoggerOps$.time(Logger.scala:125)
    at com.nawforce.pkgforce.diagnostics.LoggerOps$.debugTime(Logger.scala:111)
    at com.nawforce.apexlink.types.apex.FullDeclaration.validate(FullDeclaration.scala:122)
    at [com.nawforce.apexlink.org](http://com.nawforce.apexlink.org/).PackageAPI.$anonfun$reValidate$7(PackageAPI.scala:395)
    at [com.nawforce.apexlink.org](http://com.nawforce.apexlink.org/).PackageAPI.$anonfun$reValidate$7$adapted(PackageAPI.scala:395)
    at scala.collection.mutable.HashSet$Node.foreach(HashSet.scala:435)
    at scala.collection.mutable.HashSet.foreach(HashSet.scala:361)
    at com.
    at [com.nawforce.apexlink.org](http://com.nawforce.apexlink.org/).Flusher.$anonfun$refreshAndFlush$1(Flusher.scala:59)
    at scala.runtime.java8.JFunction0$mcZ$sp.apply(JFunction0$mcZ$sp.scala:17)
    at scala.util.DynamicVariable.withValue(DynamicVariable.scala:59)
    at [com.nawforce.apexlink.org](http://com.nawforce.apexlink.org/).Flusher.refreshAndFlush(Flusher.scala:50)
    at [com.nawforce.apexlink.org](http://com.nawforce.apexlink.org/).CacheFlusher.run(Flusher.scala:108)
    at java.base/java.lang.Thread.run(Thread.java:829)