proxy: fixed bad merge