Restructured
merge conflict solved