remove spaces from names
resolve conflict