support legacy mode
merge from remote