Fixed a couple merge errors