fixing merge conflicts
fixing merge conflicts

DM5PortfolioProj/dev-mountain-employment-portal,jasondawson/dev-mountain-employment-portal,jasondawson/dev-mountain-employment-portal,DM5PortfolioProj/dev-mountain-employment-portal