actually fixed merge