added line
erase line
new txt file added
fixed merge error