moving shit
merge shit