Pushing this so I have it at home.

This cleans up the conflict resolving a little more
Make sure we don't have pdbs