Implement conflict solving.