resolving conflict shiz