updating asset links
merging branches