Update instructions to use a branch for resolving conflicts

Updates the conflict instructions so that we ensure there is a green pipeline before fixing conflicts.