- updating server
 - merging file