fixed merge conflicts
committing to pull
does not scroll automatically