Fix git conflicts