...
resolving conflict