Really resolving that conflict now.