Making git merge understand code structure | Heykuki News