latest modified deleted
revision from conflict