thesis: fix crappy merge