User works tree view added
conflict resolved