Clarify instructions in 09_self_joins.rb
Resolve merge conflict