Fix gck file conflicts.