merge Contract and Addon