Fix unresolved conflict
Release 0.6.1