Fix merge botch