fixed merge crash

gfdi