server update and local is modify
pull file to local and merge commit