Fix after merge-conflict cleanup
Fix after merge-conflict cleanup

jotomo/AndroidAPS,jotomo/AndroidAPS,AdrianLxM/AndroidAPS,Heiner1/AndroidAPS,MilosKozak/AndroidAPS,AdrianLxM/AndroidAPS,PoweRGbg/AndroidAPS,MilosKozak/AndroidAPS,Heiner1/AndroidAPS,Heiner1/AndroidAPS,jotomo/AndroidAPS,RoumenGeorgiev/AndroidAPS,winni67/AndroidAPS,PoweRGbg/AndroidAPS,Heiner1/AndroidAPS,PoweRGbg/AndroidAPS,winni67/AndroidAPS,RoumenGeorgiev/AndroidAPS,MilosKozak/AndroidAPS