Code

Documentation: clarify 'ours' merge strategy