"There are however conflicts which a bashed patch cannot merge, and things it should not try to merge because it can cause all kinds of issues." . . . .