preparing for merge