Changes for presentation at LMU
fixing merge conflicts errors