now we actually fixed the merge conflicts