resolved merge conflicts, fixed linting issues

pyscriptjs/src/components/pyrepl.ts

@@ -95,12 +95,12 @@ export class PyRepl extends BaseEvalElement {
         let startState = EditorState.create({
           doc: this.code.trim(),
           extensions: extensions
-      })
+        });
   
         this.editor = new EditorView({
           state: startState,
           parent: this.editorNode
-      })
+        });
   
         let mainDiv = document.createElement('div');
         addClasses(mainDiv, ["parentBox", "group", "flex", "flex-col", "mt-2", "mx-8"])
@@ -123,7 +123,9 @@ export class PyRepl extends BaseEvalElement {
   
         function wrap(el: any){
           async function evaluatePython() {
-            el.evaluate()
+              el.evaluate();
+          }
+          return evaluatePython;
         }
 
         // Settings button