preping for merge