Fix files forgotten during merge