sams stuff
merge