Fixed some bad merge errors