fixed merge accident