diff --git a/lesson_2/main.cpp b/lesson_2/main.cpp
index e9935a3..4ace2e3 100644
--- a/lesson_2/main.cpp
+++ b/lesson_2/main.cpp
@@ -9,6 +9,7 @@ int Student::count = 0;
 
 int main()
 {
+<<<<<<< HEAD
 	vector<Student> students;
 
 	students.emplace_back("Олег", 20, GENDER_MALE, 75.2, 2020);
@@ -19,6 +20,21 @@ int main()
 	students.emplace_back("Анастасия", 20, GENDER_FEMALE, 55.2, 2020);
 	students.emplace_back("Ольга", 21, GENDER_FEMALE, 49.3, 2020);
 	students.emplace_back("Владимир", 19, GENDER_MALE, 69.9, 2020);
+=======
+	// Exercise 1
+
+	Student students[] =
+	{
+		Student("Олег", 20, GENDER_MALE, 75.2, 2020),
+		Student("Андрей", 19, GENDER_MALE, 72.8, 2020),
+		Student("Анастасия", 20, GENDER_FEMALE, 55.2, 2020),
+		Student("Ольга", 21, GENDER_FEMALE, 49.3, 2020),
+		Student("Владимир", 19, GENDER_MALE, 69.9, 2020)
+	};
+
+	students[0].printInfo();
+	students[2].printInfo();
+>>>>>>> e9026cb63dde16cf8340ce3ff1a35ea7d0cc0045
 
 	Student::printCount();
 
@@ -61,24 +77,3 @@ int main()
 
     return 0;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-