Implement dropbox's intra_move with conflict resolution
Implement dropbox's intra_move with conflict resolution

Johnetordoff/waterbutler,kwierman/waterbutler,RCOSDP/waterbutler,chrisseto/waterbutler,TomBaxter/waterbutler,rdhyee/waterbutler,hmoco/waterbutler,CenterForOpenScience/waterbutler,Ghalko/waterbutler,rafaeldelucena/waterbutler,icereval/waterbutler,cosenal/waterbutler,felliott/waterbutler