removed $TypeRef$
resolved conflicts