add remote server wrapper
merge