merge shit
more background