Merging deck with my teacher?

I am learning Arabic so I have created a deck with English-Arabic cards.

I used it for a while (studied, added cards, etc)

I exported it and emailed it to my new Arabic teacher so he could correct, update, add new cards if he think it is necessary.

Meanwhile, I keep studying and adding new cards on my local deck.

When my teacher will send me back his modified version of my deck, is there a way (merge) to import it or sync it without crashing my own version of the deck and losing all my progresses, intervals, new cards, etc ?
Is there a recommanded way to work and collaborate on a long time basis with a deck (for instance storing the deck itself on the cloud, say google drive or Dropbox, and both me and my teacher working with anki from it) ?