first pass at new feature
merged file 1 with newfeature
newfeature in file2