fixes
version update
update
fix
v 0.6
v 0.6
v 0.6
add conflicts subdir
moving