Unify variables names in merge_attrs
Unify variables names in merge_attrs

Follow up
https://github.com/haml/haml/commit/fda7ffe724fcb964a47c31f4c8a55186af73617f

haml/haml,haml/haml,haml/haml,haml/haml