more quirks
merged conflicts