[rk10][27M02] Conflicts and Resolutions in Ruby and Rails