fixing more bugs
fixing conflicts
conflict clean up
removed link in show page users