adding user info for home page
fixing conflicts on prod control
fixed conflicts