merging with edd