merge and make shop scaffolding
shop scafollding some
clear conclifts