newfeature branch commit
added exclamations to this file
will the latest chnages to this file which i made on the newfeatiure branch go away after I make this commit?
test merge conflict.
next commit
committing fruits