Version: 2018.1

Description

Use "theirs" (other/remote version).