tex 3. + adjusted merge
merged with master-deletions