> He can check it in now. Is this an ok? > It may be best to do another merge > immediately to pull this in and fix up conflicts... There would be none, as of now. Paolo