[FIX] Merge Diff