Fixed some conflicts caused by forgetting to merge dem