Support local and remote merge into prod now