Resolved conflict between two steps with the same name.
In progress, committing for the great git history rewrite.