add newline character
delete public/docs/css*
solve conflice