resolve conflict
resolved