Reduce wrong conflicts
Merge pull request #3 from Schimmelreiter/patch-1

Reduce wrong conflicts