ConflictFromSourceTree
Revert "ConflictFromSourceTree"

This reverts commit 341350125e1e1794d248d9d1fd57f07abe4fcaf7.