Fix git conflict