What the fuck with this merge ...