pass about_array_assignment.rb tests
fix merge errors