[releng] Fix GIT merge comments
2 files changed