merge bugfix