Updated intro and abstract
Fixed merge conflict