Update Pizza.java

resolved previous conflicts