diff --git a/src/ba/f9.dir b/src/ba/f9.dir
index c28ba8cf0..6e92437eb 100755
--- a/src/ba/f9.dir
+++ b/src/ba/f9.dir
@@ -1,3 +1,7 @@
 9
 1
+<<<<<<< HEAD
+%nditte|0|0|652|0|Ditte|||
+=======
 %nditte|0|0|754|0|Ditte|||
+>>>>>>> 0cadcd6dee4a4a67021c26174d7dea2a761fe182
diff --git a/src/ca/f151.dir b/src/ca/f151.dir
index 9cbcb5896..73d90d980 100755
--- a/src/ca/f151.dir
+++ b/src/ca/f151.dir
@@ -1,3 +1,3 @@
 151
 0
-$saldana|0|0|195|0|Saldi contabilita' analitica|||
+$saldana|0|0|189|0|Saldi contabilita' analitica|||
diff --git a/src/cg/f20.dir b/src/cg/f20.dir
index f42a45e40..26cf1c3e0 100755
--- a/src/cg/f20.dir
+++ b/src/cg/f20.dir
@@ -1,3 +1,3 @@
 20
 0
-$clifo|0|0|931||Clienti/Fornitori|||
+$clifo|0|0|916|0|Clienti/Fornitori|||
diff --git a/src/cg/f23.dir b/src/cg/f23.dir
index c837726ff..5510300f2 100755
--- a/src/cg/f23.dir
+++ b/src/cg/f23.dir
@@ -1,3 +1,3 @@
 23
 0
-$mov|||614|0|Movimenti di prima nota|NMOV||
+$mov|96160|96160|586|0|Movimenti di prima nota|NMOV||
diff --git a/src/li/f154.dir b/src/li/f154.dir
index f28624110..5478b0ef0 100755
--- a/src/li/f154.dir
+++ b/src/li/f154.dir
@@ -1,3 +1,3 @@
 154
 0
-$letint|0|0|143|0|Lettere d'intento|||
+$letint|0|0|135|0|Lettere d'intento|||
diff --git a/src/ps/CRPA/CUSTOM/ps1001.exe b/src/ps/CRPA/CUSTOM/ps1001.exe
index 58cf387e3..dedd5c166 100644
Binary files a/src/ps/CRPA/CUSTOM/ps1001.exe and b/src/ps/CRPA/CUSTOM/ps1001.exe differ