removed only branches
removed local error
doc and history updated
history updated once again
Merge branch 'page'