doc center complete
fix conflictions
SEE MORE DETAILS IN UPDATELOG.md