creating conflict
resolving conflict