Edited One line from secons console
Manual merge. No Automatic merge for one line editing