Merge resolved