Some changes in local
Try to resolve conflict
add a figure