manually merging changes from main branch