rename cnName/enName to nickname
merge,resolve conflict
resolve conflict
resolve bug
validator album type