minor changes
merge conlict resolution
a few comments