Conclusion and other stuff.
Fixed merge conflicts.