added to feature2
adding file to test conflicts
fixed typos
fixed typos in conflict
fixed merge conflicts