merge resolution (workplace-edition wins over beer-infused homework)