Title: How to Resolve Conflicts