close #32, merge conflicts were more trouble than they were worth