resolving a little conflict