more pull request stuff
started merging other changes paragraph