merge bugfixes