ProxyGen Tree Merge Snafu

Don't know what happened but it is fixed now....