merged
fixed emerge logic.
merge