merge resolution take 2
m3