this merges the upstream template and implements the pytest-xdist option and fixes keyword formattings