added all sentences
merge conflict solved