Fix conflict and wrapup user pages

Fix conflict and wrapup user pages