Correcting some merge errors