Commit3
resolving conflict with text2.txt