fixing post merge typos