Resolving conflict... ignore