merge original changes