Fixed conflicts. Added new figures.

@wronk