ng parallel devlopment.</li>

        <li>Insist that the change is re-tested and reviewed. The problem with
        this is that there is no guarantee that the same thing won't happen
        again.</li>

        <li>Merge in the new changes but don't insist on further testing or
        review.

          <ul>
            <li>In most cases any changes won't clash so there is little to
            worry about.</li>

            <li>Where there are clashes then, in most cases, they will be
            trivi