fixed merging stuff