add create movie page
resolve conflict