fixed merge conflicts
fix formatting
0.1.1