I have a shared MS Word document on Google Drive, say mydoc.docx, and I am collaborating with some others on this document. Someone updated it using the Google Drive Web rather than MS Word, and the name of the document was changed to mydoc.docx.gdoc, and I can no longer open and update it on my computer using MS Word. So I have 2 questions:
Is it possible that the name of the file is not changed (no .gdoc extension is added to the file name) when someone updates the file using the Google Drive Web, so that I use Word, she uses Web and we can still collaborate?
When both of us make updates on mydoc.docx using Google Drive PC (not Web) at the same time, are the changes merged?