We released a new version (4.0.1) of Git Clone Repository step.
Git Clone Repository
Changes:
manual_merge
yes