bugfix
text left
merge conflict solved