update the file
merge the remote