New mockup vs merge to dev