Fixed bad merge fix