Update Stack.java
conflict resolved