merged and resolved