basic line editor
fixed conflicts