fix bug
resolve mergin conflict