in iMac
merge resolved