removed useless listener
merge