Added Jeds abstract
Fixed merge conflict