Conflicts not recognized.

Post is moved here…

click to read full post containing ideas for FS Tree revision