fixing asset photo scaling
fixing conflict
tweaks