upgrade to 1.2.3
resolve conflict