Merge obj export

Merge conflict and typo corrections