Complete merge from develop

Author: louisaxel-ambroise

src/FasTnT.Domain/Data/Model/Filters/ComparisonCustomFieldFilter.cs

@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-using FasTnT.Model;
-using FasTnT.Model.Events.Enums;
-=======
 using FasTnT.Model.Enums;
 using FasTnT.Model.Events;
->>>>>>> develop
 
 namespace FasTnT.Domain.Data.Model.Filters
 {