merging main branch and assets