Merge "Fix braino in parallel move resolver."