https://peeterjoot.com/2014/11/17/resolving-merge-conflicts-due-to-automated-c-to-c-comment-changes/