add newline
add newline by mata
fix conflict