Adding some doctests.
Resolving what Git thought was a conflict.