update declaration
correct mergeconflicts Ident