Deleted .metadata... It is a source of useless merge conflicts
Oops it didn't stage all deletes. Now the metadata is REALLY gone