small changes
merge conflicts
deleted wrongly shown string