Fix the merge

src/Squidex/app/shared/state/contents.forms.ts

@@ -53,7 +53,8 @@ export class SaveQueryForm extends Form<FormGroup, any> {
                 [
                     Validators.required
                 ]
-            ]
+            ],
+            user: false
         }));
     }
 }
@@ -345,9 +346,9 @@ export class FieldDefaultValue implements FieldPropertiesVisitor<any> {
         const now = this.now || DateTime.now();
 
         if (properties.calculatedDefaultValue === 'Now') {
-            return now.toUTCStringFormat('YYYY-MM-DDTHH:mm:ss') + 'Z';
+            return `${now.toUTCStringFormat('YYYY-MM-DDTHH:mm:ss')}Z`;
         } else if (properties.calculatedDefaultValue === 'Today') {
-            return now.toUTCStringFormat('YYYY-MM-DD');
+            return `${now.toUTCStringFormat('YYYY-MM-DD')}T00:00:00Z`;
         } else {
             return properties.defaultValue;
         }
@@ -566,10 +567,6 @@ export class EditContentForm extends Form<FormGroup, any> {
         if (isInitial) {
             this.extractPrevData();
         }
-
-        this.value.subscribe(x => {
-            JSON.stringify(x);
-        });
     }
 
     public submitCompleted(options?: { newValue?: any, noReset?: boolean }) {