merge proxy branch