removed add
removed attribute writing bug
merge branch 'newbranch'
Hallo
Merge remote-tracking branch 'origin/master'
merged local changes