Manage conflict