Emergency develop merge