solved conflicts

FarmmapsZonering/Models/ZoneringInput.cs

@@ -1,6 +1,7 @@
 using System;
 using Newtonsoft.Json.Linq;
 
+
 namespace FarmmapsZonering.Models
 {
     public class ZoneringInput
@@ -16,5 +17,6 @@ namespace FarmmapsZonering.Models
         public bool CreateNewCropfield { get; set; }
         public int CropYear { get; set; }
         public JObject GeometryJson { get; set; }
+
     }
 }