Version: 5.6

Description

Use "theirs" (other/remote version).