Fix typos and finish concluding
conclusion
merge