bugfix for merge