Attemping to fix image issue.
Fixed merge conflicts.