doh, a little merge cleanup