actually fixed merge conflict