resolved merges