fixed merge, upgrade problem