Fixed a couple of merge typos