add infos
merge conflict