Fix merge typos ;)