Design klar
resolving conflict