manual update
fixes conflict