The Roth should have gone to the Roth and the employer contribution should have gone into the traditional.
