actually fixed the merge conflict