added copy
resolve conflict