Fixed bad merge mistakes