tried to fabricate a merge conflict

also investigated random segmentation faults.
NQX seem to vary between compilations, very strange behavior. some
memory leak?