Remove conflicts, clean load.

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@20268 ef53c05b-3124-4d59-ae7d-fe3273f42be7