Fix Merge Typos