merge code from nginx