cleaning up some more git merge conflicts, image assets and story board