stufffxxx
merge resolution