merge and resolved