Fixed location for figure
Merged conflict and corrected a typo