conditions update + android app icon
conflict resolved+ android app icon