update credits
merge