Manual merge

I created a file and then deleted it and it's causing problems. Don't know if you know how to merge manually? The main changes are docs in 3 classes.