add newline use dev
& simple
delete last line
AND simple
& simple
conflict fixed