merge conflicts resolved for 3.1
