Recent changes, manual merges!