merged original changes