update sprite
merging conflict
updating mobile styles