pep8 pulp client admin
resolve conflicts