chore(angular-movies): cleaned up merge files