changes for merge