fixed merge remote capabilities