add somethings
merge
remove merge msg