More changes related to Merging