changed expected error message if remote branch doesn't exist on merge