modified the file committed by dev1
edit lipsum
same time commit
Merge branch 'test' of https://github.com/somimar/sample into test

Conflicts:
test/Lorem ipsum
conflict resolve
conflict resolve
conflict trial
conflict in terminal
debugged conflict
removed dump lines
debugged conflict 312312
fixed the conflicted line
lorem ipsum
fixing testing
test fixed
yolo
fix123123
fixing 123123123123
apply test without conflict