Fix merge conflict

src/main/java/engine/engineMain/Handler.java

src/main/java/engine/engineMain/MainApp.java

src/main/java/view/ViewModel.java

src/main/resources/textures/Messages/GameOver.png