prepare for pull
prepare for pull2
resolve conflict
updated all web scripts