[BUGFIX] Fixed merge issues

src/main/java/org/parabot/core/ui/BotUI.java

@@ -151,7 +151,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
         this.performCommand(e.getActionCommand());
     }
 
-    public void performCommand(String command){
+    public void performCommand(String command) {
         switch (command) {
             case "Create screenshot":
                 try {
@@ -218,6 +218,12 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
                 pauseScript = true;
                 break;
             case "Stop":
+                if (pauseScript) {
+                    pauseScript = false;
+                    pause.setEnabled(false);
+                    run.setEnabled(true);
+                    stop.setEnabled(false);
+                }
                 setScriptState(Script.STATE_STOPPED);
                 break;
             case "Logger":

src/main/java/org/parabot/core/ui/Logger.java

@@ -4,6 +4,8 @@ import org.parabot.core.ui.components.GamePanel;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * @author JKetelaar
@@ -23,6 +25,16 @@ public class Logger extends JPanel {
         JScrollPane pane = new JScrollPane(list);
         add(pane, BorderLayout.CENTER);
 
+        JButton button = new JButton("Clear Logger");
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                clearLogger();
+                addMessage("Logger cleared", false);
+            }
+        });
+        add(button, BorderLayout.SOUTH);
+
         list.setCellRenderer(getRenderer());
 
         model = new DefaultListModel<>();