change explorer to tree and resolve conflict