Fix conflict in SlaveListener
Fix conflict in SlaveListener
Fix conflicts in SlaveListener