combine changes (227 views)