initial version
merge local and remote