<<<<<<< HEAD
__version_info__ = (0, 6, 0)
=======
__version_info__ = (0, 5, 7)
>>>>>>> hotfix/0.5.7
__version__ = '.'.join([str(i) for i in __version_info__])

__version_info__ = (0, 6, 0)
__version__ = '.'.join([str(i) for i in __version_info__])

Fix version conflict and bump to 0.6
Fix version conflict and bump to 0.6
