Merge with deployment branch