pre-pull
fixed merged branch & html