changes related to merge