Revert "minor changes"

This reverts commit d53e14fb6ba0dca67dd5b8c3a71be52e2696beb2.
Fixing merge conflicts