Fix missed conflict
Fix type...what is going on???