small changes
merge conflicts resolved