pex version
fix conflicts