Fix unresolved conflict
Release 0.6.1
Merge branch 'fix/merge-conflicts' into development