fixed the resolver
added some minor changes to element
merged the new setup