new change for merging