Index: src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java
===================================================================
--- src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java	(revision d59ae27e8959ba70626d6e6b080c407d0ad905ca)
+++ src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java	(revision 428c8a4f811a2c263f4a0247d202aeb0cf60bd8c)
@@ -1,7 +1,4 @@
 package com.example.moviezone.model.manytomany;
-<<<<<<< Updated upstream
 
-=======
->>>>>>> Stashed changes
 import jakarta.persistence.*;
 import lombok.Getter;
@@ -15,9 +12,7 @@
 @ToString
 @RequiredArgsConstructor
-<<<<<<< Updated upstream
+
 @Table(name = "`cinema_plays_film`")
-=======
-@Table(name = "cinema_plays_film")
->>>>>>> Stashed changes
+
 @IdClass(CinemaPlaysFilmId.class)
 public class CinemaPlaysFilm {
@@ -25,12 +20,9 @@
     @Column(name = "id_cinema")
     Integer id_cinema;
-<<<<<<< Updated upstream
-    @Column(name = "id_film")
-    @Id
-=======
+    
+
 
     @Id
     @Column(name = "id_film")
->>>>>>> Stashed changes
     Integer id_film;
 }