temp structure test
resolve conflict