google drive conflict cleaned up