add emmit
merge