Pubstwo 984 second try

Looks like an un-fixed merge conflict. What did you use for a mergetool?