add movie_edit
merge file