Fix Merge Typo