fix spec
update version to remove debugging
fix conflicts