fix merge-conflict release-0.2.0 and bugfix-#205