fixed more merge typos