[TASK] Fix Merge Problem