Update management pages
Resolve conflicts index user