structure change
conflicts merge, re-structuration and re-factoring