diff --git a/cg/cg0200a.uml b/cg/cg0200a.uml
index 4d0315094..ce4b2c15b 100755
--- a/cg/cg0200a.uml
+++ b/cg/cg0200a.uml
@@ -639,8 +639,13 @@ END
 
 STRING F_CODVAL 3
 BEGIN
+<<<<<<< cg0200a.uml
+PROMPT 2 6 "Valuta      "  
+FLAGS "UZ"
+=======
 PROMPT 2 6 "Valuta      "
 FLAGS "UZ"
+>>>>>>> 1.23
 FIELD LF_CLIFO->CODVAL
 USE %VAL
 INPUT CODTAB F_CODVAL