fixed merge fubar