merge conflict
added app icon