Resolve conflics
pull in updates
remove temp file
conflicts
Resolve conflicts
Add nav bar links
Only show manager and admin links if logged in user has permission