Make pwx directory, rip out personal info
Resolve conflict