fixing compability of apilevel 14
fixed conflict