Add instructions for resolving Saxon conflicts