Fix merge botch (I assume?)