replace fetch + merge with git pull
to silence warning about misalignment of class-end declaration