Buddy: Fix git conflict check

[joemcgill]

This fixes an issue where the buddy config file was being caught during the check for git conflicts action.