fixed merging problems