Update changes for merge