# Conflicts: # .gitlab-ci.yml # Dockerfile # Dockerfile-test-env Resolved by importing both PyOWM and BeautifulSoup4