bugfix after merging files