Hopefully fixed bad merge