add new functions.
test for conflict source tree