The files below were apparenly committed without conflicts being
resolved in one of the mergers.