Fixing merging problem