app name and image change
conflict resolved