Added tree improvisations instead of complete reload
conflict resolution