diff --git a/Controllers/GetPosts.cs b/Controllers/GetPosts.cs
index e244c68..8f2741c 100644
--- a/Controllers/GetPosts.cs
+++ b/Controllers/GetPosts.cs
@@ -14,7 +14,7 @@ namespace NeDvachAPI.Controllers
             //Post[] posts  = DBchat.DbList();
             List<Post> posts  = DBchat.DbList();
             string postsJson = JsonSerializer.Serialize(posts);
-            Console.WriteLine("Запрошен список постов.);
+            Console.WriteLine("Запрошен список постов");
             return postsJson ;
 
 
diff --git a/DBchat.cs b/DBchat.cs
index a35030f..d6be19b 100644
--- a/DBchat.cs
+++ b/DBchat.cs
@@ -65,17 +65,11 @@ namespace NeDvachAPI
                             //);
                         Post receivedPost = new()
                         {
-<<<<<<< HEAD
                             Id = reader.GetInt32(0),
                             Text = reader.GetString(1),
                             Timestamp = reader.GetString(2),
                             ImgURL = (string)reader.GetString(3)
-=======
-                            //Date = DateTime.Now,
-                            Id        = reader.GetInt32(0),
-                            Text      = reader.GetString(1),
-                            Timestamp = reader.GetString(2)
->>>>>>> 10b089091585b363d2cf227a688da611f5870b5d
+
                         };
                         posts.Add(receivedPost);
                         //posts[postCount] = receivedPost;