Merging last minute changes