file to use to text merge conflitcs
fixed typos
changing conflict file
merged conflicts