Restructure
merge conflict