[itamarst]

1. Don't fight over unimportant things. Setup flake8 with all the plugins, maybe use yapf, try to make the coding style issues just go away.

2. Try to figure out why this is happening. There's usually a reason. Most likely it's managerial incompetence, but maybe not, and even if you can't figure out a solution being able to identify the problem is a useful skill (and might help you minimize conflict).

3. Try to switch teams. If that doesn't work, start thinking about switching jobs.