Merge branch 'master' of /home/leo/github/pluvia with conflicts.
improve resolution settings