Merge conflict resolved + restructured files