explored update
merge conflict