Fix merge conflict in a46f79d7cfaa4f70c414d796bb964beb4ca2cb1a

Resolved the conflicts but missed adding it when merging the commit.