adding merge migration