change validation messages [#2378]
resolve conflict