git is saying these files are still different