solving clonflicts