made new file with merged version