Smarts

Resolving master conflicts