Fix the wrong files being merged