Fix YodiiCommands merge