Finished the sentence
Finished sentence
Fixed merge conflict
Added a sentence
Another merge conflict