updated version
updated deps
fix conflicts