merged changes into original file