switch to our branches (patches merged)