bug fixed
resolve conflict
addition complete