fixed application conflict