logging is a class you need to create an instance of first before you can use it (well you should create an instance first). This is why many of our files have this line near the top after the imports:
<pre>log = logging.getLogger(__name__)</pre>

Then you can use log.info("blah").

Also just because you use "git checkout --theirs <filename>" doesn't mean your getting only the upstream changes, according to this review it shows that you made changes to these 2 lines. This is why you should always review fully your merge conflicts to make sure it only changes what you expect it to change.

Use "gitk" or "git diff" after resolving a conflict to double check your changes before committing them and confirming the resolution.