merges resolved