merge main branch with my modifications