A more suitable alternative was developed simultaneously in a parallel
branch. It replaced this step in the merge conflict resolution between
the branches.