fix errant merge
fix errant merge