Add pre commits: flake8 and merge conflicts

This is an improvement on !727 (closed), instead of "doing" everything we can introduce things slowly :)