Whoops bad merge on top of being a painful merge