finish shop homepage
merge db