Fix merge botch.