Flattened history in master