Remove conflict merge
Comment delete button for movie in cinema page
Add seat functionality on admin