merge resolved