sample file added 2nd line
added new line
after removing merge conflict