Fix git conflict detect