remove multiple listener
fix some conflicts
Merge branch 'master' of github.com:cytms/java-final-project
final