Update App.java

Problems with the merge, fixing it