DB merge fix