Fix merge conflict, sorta.