add edit movie data
merge conflct