fix merge again w/ generated