added feature 1
fixed bug # 1234
added feature 2
fixing 1234 sedonc time
adding addionalfile
resolved conflitscht with featture to master
feature 3
fixed merge issue
modified file
add duplicate line