Added 'update' and 'conflict' remark