Merge newest changes and prepare for deployment