add newlines at end of file
add new lines at end of files
add newlines at end of files
fix indent
fix indent
add newlines at end of files
add newline; resolve conflict