How to quickly solve conflicts.