merge new code & repub