finished merge by changing Display.java