forgot this part of the merge conflict