procurement dashboard
update web config
resolve conflicts