git: merge startegy theirs