copy relevant stuff from old branch