Added echo line
Resolved conflict - both file merged