Version: 2017.3

Description

Use "theirs" (other/remote version).