diff --git a/src/Main.java b/src/Main.java
index 881c4a5..21dd90d 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,7 +1,10 @@
+import service.AuthService;
+
 //TIP To <b>Run</b> code, press <shortcut actionId="Run"/> or
 // click the <icon src="AllIcons.Actions.Execute"/> icon in the gutter.
 public class Main {
     public static void main(String[] args) {
-
+        AuthService authService = new AuthService();
+        authService.service();
     }
 }
\ No newline at end of file
diff --git a/src/db/DataSource.java b/src/db/DataSource.java
index 9135d1d..c15db43 100644
--- a/src/db/DataSource.java
+++ b/src/db/DataSource.java
@@ -19,14 +19,11 @@ public class DataSource {
     public static Set<User> teachers = new HashSet<>();
     public static Set<Group> groups = new HashSet<>();
     static {
+
         User admin = new User("admin","admin","admin", Role.ADMIN);
-<<<<<<< HEAD
-        User teacher1 = new User("teacher1","teacher1","teacher1", Role.STUDENT);
-        User teacher2 = new User("teacher2","teacher2","teacher2", Role.STUDENT);
-=======
+
         User teacher1 = new User("teacher1","teacher1","teacher1", Role.TEACHER);
         User teacher2 = new User("teacher2","teacher2","teacher2", Role.TEACHER);
->>>>>>> 58ece0c4f27e49562169e5b09a77c87f9df68306
         User a = new User("a","a","a", Role.STUDENT);
         User b = new User("b","b","b", Role.STUDENT);
     }
diff --git a/src/entity/Group.java b/src/entity/Group.java
index 9854ae7..1dcef77 100644
--- a/src/entity/Group.java
+++ b/src/entity/Group.java
@@ -67,7 +67,6 @@ public String toString() {
                 ", name='" + name + '\'' +
                 ", maxLessonInMonth=" + maxLessonInMonth +
                 ", teacher=" + teacher +
-                ", groupStudents=" + groupStudents +
                 '}';
     }
 }
diff --git a/src/entity/Student.java b/src/entity/Student.java
index 26f3802..cc46ceb 100644
--- a/src/entity/Student.java
+++ b/src/entity/Student.java
@@ -1,9 +1,12 @@
 package entity;
 
-public class Student extends User{
+public class Student extends User {
     private StringBuilder marks = new StringBuilder();
     private String groupId;
 
+    public Student() {
+    }
+
     public Student(String groupId) {
         this.groupId = groupId;
     }
diff --git a/src/entity/StudentAttendanceDaily.java b/src/entity/StudentAttendanceDaily.java
index 42b1402..4998189 100644
--- a/src/entity/StudentAttendanceDaily.java
+++ b/src/entity/StudentAttendanceDaily.java
@@ -9,8 +9,7 @@ public class StudentAttendanceDaily {
     private String studentName;
     private AttendanceStatus status;
 
-    public StudentAttendanceDaily(String studentId, String studentName, AttendanceStatus status) {
-        this.studentId = studentId;
+    public StudentAttendanceDaily(String studentName, AttendanceStatus status) {
         this.studentName = studentName;
         this.status = status;
     }
@@ -19,9 +18,6 @@ public String getStudentId() {
         return studentId;
     }
 
-    public void setStudentId(String studentId) {
-        this.studentId = studentId;
-    }
 
     public String getStudentName() {
         return studentName;
diff --git a/src/ui/StudentUi.java b/src/ui/StudentUi.java
index 046bd77..3166687 100644
--- a/src/ui/StudentUi.java
+++ b/src/ui/StudentUi.java
@@ -1,13 +1,16 @@
 package ui;
 
+import entity.Attendance;
+import entity.Group;
+import entity.Student;
 import entity.User;
 
 import static db.DataSource.*;
 
 public class StudentUi {
-
+    public static User currentUser;
     public void studentUi(User user) {
-
+        currentUser = user;
         while (true) {
             System.out.println("""
                     0 exit
@@ -28,9 +31,20 @@ public void studentUi(User user) {
     }
 
     private void myAttendance() {
+//        Attendance attendance = new Attendance();
+//        System.out.println(attendance.getAttendedStudents());
 
+        for (Group group : groups) {
+            if (group.getGroupStudents().equals(currentUser)){
+                System.out.println(group);
+            }
+        }
     }
 
     private void myMarks() {
+       Student student = new Student();
+        for (int i = 0; i < students.size(); i++) {
+            System.out.println(student.getMarks());
+        }
     }
 }