structure changes
conflicts resolved