Fixing one more merge defect