removes .orig and backup files after merge