oops, screwed up merging the log. fixed it.