resolve merged