Fix tricky merge