begin explore view
fix merge conflict