bug was fixed
Konflikte behoben