bad merge fix