package keymix;

import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.text.Text;

public class Controller {
    public Controller() {

    }
}
package keymix;

import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.text.Text;

public class Controller {
    public Controller() {

    }
}

Fix some merge conflicts in SoundManager and Controller with the upstream