diff --git a/version/git-version.ts b/version/git-version.ts
index 9a000494b..690a5390c 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "05d8bf424",
-  "SHA": "05d8bf424e3dc35c826b24d1a374e65ab21b55d3",
+  "shortSHA": "889e38290",
+  "SHA": "889e3829055600bad6938f6a4826a58ebfb7bfa7",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Thu Mar 9 16:58:34 2023 +0100'",
-  "lastCommitMessage": "git pull made and peter chnages recived",
-  "lastCommitNumber": "4859",
+  "lastCommitTime": "'Fri Mar 10 09:05:33 2023 +0100'",
+  "lastCommitMessage": "commit after resolve merge conflit",
+  "lastCommitNumber": "4860",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 3 and 2 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/models/beast-orm.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.page.html\n\tmodified:   src/app/shared/popover/chat-popover/chat-popover.page.ts\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.ts",
+  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 4 and 2 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)",
   "changeAuthor": "eudes.inacio"
 }
\ No newline at end of file