Fix merge conflicts again.