Fixed: Problem of merging