How to resolve conflicts faster