Added 'text' to comment
Added conflicting comment
more practice
Changed
Fixed
Merge branch 'master' of https://github.com/gopalchicken/SWC_colab
terns were fixed