trying resolving conflict