convert-merge-rails: merge remnants if conflict at first changeset
In case the first changeset of the list of those to be successfully tried and merged has conflicts, the working directory is not cleaned up and the litter blocks subsequent runs.
Most probably due to the cleanups being at the beginning of the loop, which is not executed again in this case.