preparing to merge development