cheap way to fix crappy merge