Bug correction + join examples
Merging conflict