preping merge