Version: 2017.2

Description

Use "theirs" (other/remote version).