Fixed merge issues and updates imports.
With Tom Paolillo