Correct git's appalling merging causing compile issues.