update makros
merge