minor changes
merge conflicts