removed text insterted after a merge conflict with the feature and bugfix branch