merge bugfix and deps udpate