Fixing git freaking out because of two files with the same name