adding to text file
change
resolving confict
adding content
fix conflicts