last version of callback before merge is fixed
merge fixed