rolling back manual-copy from unmerged branch