Title: How to manage conflict