finished the routine page button
before merge
fixed merge conflict and push to origin