resolving a conflict