resolved merge conflicts in MyWindow.java