merge site with Mistakes Made 1.2.0 theme