Made sure the merge worked properly