Merge development changes into production