more changes
more styling
fixed merge conflict
Merge conflicts fixed