fixed merge
create new principals when upgrading