diff --git a/.gitignore b/.gitignore
index cd74d38..8a7aded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,12 @@
 __pycache__/
 res/output/
+<<<<<<< HEAD
 res/input/*
 .vscode/*
 *.json
+=======
+res/input/
+>>>>>>> 351dc2e6d0158a1b81601f48503f761ea4995e58
 *.pyc
 *.png
 debug.py
\ No newline at end of file
diff --git a/gui/gui.py b/gui/gui.py
index f3dad76..148db12 100644
--- a/gui/gui.py
+++ b/gui/gui.py
@@ -1,5 +1,5 @@
 from gui.utils import nassi, output
-from interpreter.interpret_source import JavaSyntaxError, ScopeNotFoundExeption
+from interpreter.interpret_source import JavaSyntaxError, ScopeNotFoundException
 import PySimpleGUI as sg
 import os.path
 import random