merge designer stuff