edits to cause conflicts
Merge with stragegy "ours" to ignore the directory structure changes
Merge branch 'master' into full-tree
Merge commit '2c3d95bba1a17a685786d43370c25f47b4301945'
merge with strategy "ours" to ingnore this merge