piyococco display change
resolve conflict