oops, fixed remaining merge artifacts