More conflict resolution (in config window)