Updated files using patch and interactive add
added stashed changes
Added stashed changes.
Added another file
Changed in to inside of
Changed another to the other
Merge branch 'bug-fix'

Conflicts:
	fix.txt