revert structure changes
resolve conflict
revert structure changes