update my brach with the changes from main branch