Re-add movie giving rev conflict

fix #3939