minor changes
minor changes
merge conflicts eliminated