handle indentation
resolved conflicts
bump 0.1.1