update to 3.11
merge conflicts