merge stardust with changes