@EHutchins - I edited my answer, as @dmertz points out I did overlook the fact you did not combine accounts, so please remove the excess separately.
Although your employer also contributes money, they still should not allow you to overcontribute- can you confirm that your W-2 shows more than $4,150 in Box 12 Code W for both of you?
