update
merge remote
udpate two versions