New Commit
changed variable
resolved conflict in SingleJPanel.java