remove conflict string
added lot staff
changes for mac
merge
bump version
Merge branch 'release/0.5.0'

* release/0.5.0:
  bump version
  changes for mac
  added lot staff
  remove conflict string