Test/for nice merging

Testing https://houndci.com