added emit to
merge conflict in lobby state