Resolved merge conflict

.gitignore

src/main/Main.java

src/uiutils/ButtonPanel.java

src/uiutils/LabelPanel.java

src/uiutils/SimpleFrame.java

src/utils/Debug.java