resolving conflicts in test_statistics.py

.gitlab-ci.yml

contrib/floopy-highlighting/floopy.vim

doc/reference.rst

doc/tutorial.rst

loopy/__init__.py

loopy/buffer.py

loopy/context_matching.py

loopy/expression.py

loopy/frontend/fortran/__init__.py

loopy/fusion.py

loopy/kernel/__init__.py

loopy/kernel/creation.py

loopy/precompute.py

loopy/statistics.py

loopy/subst.py

loopy/symbolic.py

loopy/target/c/codegen/expression.py

loopy/version.py

test/test_fortran.py

test/test_loopy.py