Quick hotfix, Git on Windows ignores case for filenames and caused a merge issue.