A1 fertig
solving merging confilcts