merge with interface changes.