sams fix
sams merge