handle conflicts