Update documentation

This was one of the merge conflicts, I must've gotten mixed up with the results. I'll remove it again