merge in stuff