commit by nan
resolve conflic