merge all the stuff I've done