Actually fixed the merge conflict now.