Hello merge conflict
Working on the docs some more