minor comments
merge conflicts