partially correct version
resolve conflict