add italic word
change master
fixed-merge-conflict
Merge pull request #3 from ID708235/small-conflict

Small conflict