Fixing merge typos.