removed missed .orig files from merge