Edit name to nati
Fix conflict