Started to add abstract
Fixed conflicts