Trying to resolve a Git pull full of conflicts | Heykuki News