Merged and resolved