application conflict solved