Fix git conflicts.