chore : Fix merge conflicts

peri044 · peri044 · commit 41bf83849492 · 2021-12-02T13:24:26.000-08:00
Signed-off-by: Dheeraj Peri &lt;peri.dheeraj@gmail.com&gt;
diff --git a/core/conversion/conversion.cpp b/core/conversion/conversion.cpp
@@ -1,11 +1,6 @@
-<<<<<<< HEAD
-#include <sstream>
-
-=======
->>>>>>> 367dd7bb... chore: refactor applyIdentityOp
-#include "core/conversion/conversion.h"
 #include <torch/torch.h>
 #include <sstream>
+#include "core/conversion/conversion.h"
 #include "core/conversion/conversionctx/ConversionCtx.h"
 #include "core/conversion/converters/converters.h"
 #include "core/conversion/evaluators/evaluators.h"
