after merge with server files
commit merged files