Serverside conflict checking, and clientside conflict resolution are now working. Next step is literally the file copying