icons
renaming attributes
changed boolean types
merge conflict