some updates
some changes
conflicts resolved