merging dev and prod