Update Stack.java
conflicts resolved