Merriam agreed to shuffle some incentive boundaries around to make way for apartments that will be near the new Trader Joe's.