Oops, mismerge in principal.c
Oops, mismerge in principal.c

madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal