some merge fix