change versions back to normal after merge