bugfix for merging