Improved documentation for sibling conflicts

This is in relation with #162