own improvement 1
resolve conflict