Choose instance only if it is running
Merge remote-tracking branch 'origin/master'