merged modification