Update mytest.txt
added new statement
merged conflict
rebased master to this branch
merged after rebase