change showing words
merge change_to_haml