Fix an issue when merging two interface types
Fix issue with how the set of interfaces a class implements is calculated