Merge development branch into production branch