Fixed base branch recording
Merge branch 'bug/base-branch/wrong-format'