Resolve conflicts between commits

This commit fixes the discrepancies between my estimate theta commit
and Elif’s documentation commit from April 7.