version 2
resolve conflict